Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <[email protected]>
Thu, 14 Aug 2008 12:56:40 +0000 (14:56 +0200)
committerWolfgang Denk <[email protected]>
Thu, 14 Aug 2008 12:56:40 +0000 (14:56 +0200)

Trivial merge